From 7be6aca3adee80129da481bc7eb444e84eb6b86d Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 11 Nov 2005 14:54:20 +0100 Subject: [PATCH] Missed two files from NULL-pointer-check changeset. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 3 +-- linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index 93c39fd858..30486a426d 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -1173,8 +1173,7 @@ again: destroy_ring: shutdown_device(info); out: - if (backend) - kfree(backend); + kfree(backend); return err; } diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c index 55ba4b41ad..a646a3d301 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c @@ -570,10 +570,8 @@ void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt, ...) } fail: - if (printf_buffer) - kfree(printf_buffer); - if (path_buffer) - kfree(path_buffer); + kfree(printf_buffer); + kfree(path_buffer); } EXPORT_SYMBOL(xenbus_dev_error); -- 2.30.2